a30a9b80b532fb8c53823a68d927fbd05d668934,runAs-agent/src/main/java/jetbrains/buildServer/runAs/agent/UserCredentialsServiceImpl.java,UserCredentialsServiceImpl,tryGetUserCredentials,#,44

Before Change



      String credentialsRef = myParametersService.tryGetParameter(Constants.CREDENTIALS_PROFILE_ID);
      if (StringUtil.isEmptyOrSpaces(credentialsRef)) {
        return getPredefinedCredentials("default", false);
      }

      return getPredefinedCredentials(credentialsRef, true);

After Change



      String credentialsRef = myParametersService.tryGetParameter(Constants.CREDENTIALS_PROFILE_ID);
      if (StringUtil.isEmptyOrSpaces(credentialsRef)) {
        userCredentials = getPredefinedCredentials("default", false);
        if(LOG.isDebugEnabled()) {
          LOG.debug("tryGetUserCredentials predefined \"" + Constants.CREDENTIALS_PROFILE_ID + "\": " + userCredentials);
        }

        return userCredentials;
      }

      userCredentials = getPredefinedCredentials(credentialsRef, true);
      if(LOG.isDebugEnabled()) {
        LOG.debug("tryGetUserCredentials predefined \"" + credentialsRef + "\": " + userCredentials);
      }

      return userCredentials;
    }

    if(allowCustomCredentials) {
      String credentialsRef = myParametersService.tryGetParameter(Constants.CREDENTIALS_PROFILE_ID);
      if (!StringUtil.isEmptyOrSpaces(credentialsRef)) {
        throw new BuildStartException("The usage of credentials is prohibited");
      }

      userCredentials = tryGetCustomCredentials();
      if(LOG.isDebugEnabled()) {
        LOG.debug("tryGetUserCredentials custom: " + userCredentials);
      }

      return userCredentials;
    }

    if(allowProfileIdFromServer) {
      String credentialsRef = myParametersService.tryGetConfigParameter(Constants.CREDENTIALS_PROFILE_ID);
      if (StringUtil.isEmptyOrSpaces(credentialsRef)) {
        credentialsRef = DEFAULT_CREDENTIALS;
      }

      userCredentials = getPredefinedCredentials(credentialsRef, true);
      if(LOG.isDebugEnabled()) {
        LOG.debug("tryGetUserCredentials predefined \"" + credentialsRef + "\": " + userCredentials);
      }

      return userCredentials;
    }

    LOG.debug("tryGetUserCredentials returns null");
    return null;
  }